From c049581f79b37fa2e1c8e9bdd6545b3b43c22bed Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 15 Dec 2015 15:37:33 +0800 Subject: [PATCH] MSVC builds: Build more tools in gtk/ Build the gtk-update-icon-cache, gtk-builder-tool and gtk-query-settings tools and run gtk-update-icon-cache as part of the post-build "installation" process. Pointed out (and reminded) by Paolo Borelli in bug 759436 that we should build, "install" and run gtk-update-icon-cache in the MSVC builds as well. --- build/win32/vs10/Makefile.am | 6 + build/win32/vs10/gtk+.sln | 54 ++++++ build/win32/vs10/gtk-builder-tool.vcxproj | 181 ++++++++++++++++++ .../vs10/gtk-builder-tool.vcxproj.filters | 20 ++ build/win32/vs10/gtk-query-settings.vcxproj | 181 ++++++++++++++++++ .../vs10/gtk-query-settings.vcxproj.filters | 20 ++ .../win32/vs10/gtk-update-icon-cache.vcxproj | 177 +++++++++++++++++ .../gtk-update-icon-cache.vcxproj.filters | 20 ++ build/win32/vs10/gtk3-install.propsin | 22 +++ build/win32/vs10/gtk3-install.vcxproj | 12 ++ build/win32/vs11/Makefile.am | 6 + build/win32/vs12/Makefile.am | 6 + build/win32/vs14/Makefile.am | 6 + build/win32/vs9/Makefile.am | 3 + build/win32/vs9/gtk+.sln | 68 +++++++ build/win32/vs9/gtk-builder-tool.vcproj | 172 +++++++++++++++++ build/win32/vs9/gtk-query-settings.vcproj | 172 +++++++++++++++++ build/win32/vs9/gtk-update-icon-cache.vcproj | 172 +++++++++++++++++ build/win32/vs9/gtk3-install.vspropsin | 21 ++ 19 files changed, 1319 insertions(+) create mode 100644 build/win32/vs10/gtk-builder-tool.vcxproj create mode 100644 build/win32/vs10/gtk-builder-tool.vcxproj.filters create mode 100644 build/win32/vs10/gtk-query-settings.vcxproj create mode 100644 build/win32/vs10/gtk-query-settings.vcxproj.filters create mode 100644 build/win32/vs10/gtk-update-icon-cache.vcxproj create mode 100644 build/win32/vs10/gtk-update-icon-cache.vcxproj.filters create mode 100644 build/win32/vs9/gtk-builder-tool.vcproj create mode 100644 build/win32/vs9/gtk-query-settings.vcproj create mode 100644 build/win32/vs9/gtk-update-icon-cache.vcproj diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index ea8fac12dc..5f6dd6dd7c 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -43,8 +43,14 @@ EXTRA_DIST += \ gdk-3.vcxproj.filtersin \ gtk-3.vcxprojin \ gtk-3.vcxproj.filtersin \ + gtk-builder-tool.vcxproj \ + gtk-builder-tool.vcxproj.filters \ gtk-encode-symbolic-svg.vcxproj \ gtk-encode-symbolic-svg.vcxproj.filters \ + gtk-query-settings.vcxproj \ + gtk-query-settings.vcxproj.filters \ + gtk-update-icon-cache.vcxproj \ + gtk-update-icon-cache.vcxproj.filters \ gtk3-demo.vcxprojin \ gtk3-demo.vcxproj.filtersin \ gtk3-demo-application.vcxprojin \ diff --git a/build/win32/vs10/gtk+.sln b/build/win32/vs10/gtk+.sln index 7a7cbc1833..1e9a52e035 100644 --- a/build/win32/vs10/gtk+.sln +++ b/build/win32/vs10/gtk+.sln @@ -22,6 +22,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil-3", "gailutil-3.vcxproj", "{A1FCED61-4E51-4015-A70C-5373404D1BA0}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-update-icon-cache", "gtk-update-icon-cache.vcxproj", "{FC98AF16-4C68-42DF-906B-93A6804C198A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-builder-tool", "gtk-builder-tool.vcxproj", "{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-query-settings.vcxproj", "{9F22107A-3EF7-4B52-B269-747B65307F36}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcxproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}" EndProject Global @@ -220,6 +226,54 @@ Global {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.Build.0 = Release|Win32 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.ActiveCfg = Release|x64 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.Build.0 = Release|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.ActiveCfg = Debug|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.Build.0 = Debug|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.ActiveCfg = Debug|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.Build.0 = Debug|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.ActiveCfg = Release|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.Build.0 = Release|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.ActiveCfg = Release|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.Build.0 = Release|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.Build.0 = Debug|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.Build.0 = Release|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.ActiveCfg = Release|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.Build.0 = Release|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.ActiveCfg = Debug|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.Build.0 = Debug|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.ActiveCfg = Debug|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.Build.0 = Debug|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.ActiveCfg = Release|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.Build.0 = Release|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.ActiveCfg = Release|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.Build.0 = Release|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.Build.0 = Debug|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.Build.0 = Release|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.ActiveCfg = Release|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.Build.0 = Release|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.ActiveCfg = Debug|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.Build.0 = Debug|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.ActiveCfg = Debug|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.Build.0 = Debug|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.ActiveCfg = Release|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.Build.0 = Release|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.ActiveCfg = Release|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.Build.0 = Release|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.Build.0 = Debug|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/win32/vs10/gtk-builder-tool.vcxproj b/build/win32/vs10/gtk-builder-tool.vcxproj new file mode 100644 index 0000000000..1730019df3 --- /dev/null +++ b/build/win32/vs10/gtk-builder-tool.vcxproj @@ -0,0 +1,181 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD} + gtkencodesymbolicsvg + Win32Proj + + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + %(AdditionalDependencies) + true + Console + MachineX86 + + + + + MaxSpeed + %(AdditionalIncludeDirectories) + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + %(AdditionalIncludeDirectories) + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + true + Console + true + true + MachineX64 + + + + + + + + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} + false + + + {95a4b53d-2773-4406-a2c1-8fd2840bbad8} + false + + + + + + diff --git a/build/win32/vs10/gtk-builder-tool.vcxproj.filters b/build/win32/vs10/gtk-builder-tool.vcxproj.filters new file mode 100644 index 0000000000..8b19c8b0f3 --- /dev/null +++ b/build/win32/vs10/gtk-builder-tool.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Sources + + diff --git a/build/win32/vs10/gtk-query-settings.vcxproj b/build/win32/vs10/gtk-query-settings.vcxproj new file mode 100644 index 0000000000..3c84329295 --- /dev/null +++ b/build/win32/vs10/gtk-query-settings.vcxproj @@ -0,0 +1,181 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {9F22107A-3EF7-4B52-B269-747B65307F36} + gtkencodesymbolicsvg + Win32Proj + + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + %(AdditionalDependencies) + true + Console + MachineX86 + + + + + MaxSpeed + %(AdditionalIncludeDirectories) + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + %(AdditionalIncludeDirectories) + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + true + Console + true + true + MachineX64 + + + + + + + + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} + false + + + {95a4b53d-2773-4406-a2c1-8fd2840bbad8} + false + + + + + + diff --git a/build/win32/vs10/gtk-query-settings.vcxproj.filters b/build/win32/vs10/gtk-query-settings.vcxproj.filters new file mode 100644 index 0000000000..42804c1aee --- /dev/null +++ b/build/win32/vs10/gtk-query-settings.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Sources + + diff --git a/build/win32/vs10/gtk-update-icon-cache.vcxproj b/build/win32/vs10/gtk-update-icon-cache.vcxproj new file mode 100644 index 0000000000..7b795afb2d --- /dev/null +++ b/build/win32/vs10/gtk-update-icon-cache.vcxproj @@ -0,0 +1,177 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FC98AF16-4C68-42DF-906B-93A6804C198A} + gtkencodesymbolicsvg + Win32Proj + + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + %(AdditionalDependencies) + true + Console + MachineX86 + + + + + MaxSpeed + %(AdditionalIncludeDirectories) + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + %(AdditionalIncludeDirectories) + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + true + Console + true + true + MachineX64 + + + + + + + + {b98fbe68-b03c-48e3-8f32-c3c010720d30} + false + + + + + + diff --git a/build/win32/vs10/gtk-update-icon-cache.vcxproj.filters b/build/win32/vs10/gtk-update-icon-cache.vcxproj.filters new file mode 100644 index 0000000000..24d654bd72 --- /dev/null +++ b/build/win32/vs10/gtk-update-icon-cache.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Sources + + diff --git a/build/win32/vs10/gtk3-install.propsin b/build/win32/vs10/gtk3-install.propsin index 7d875da1a9..feb5724468 100644 --- a/build/win32/vs10/gtk3-install.propsin +++ b/build/win32/vs10/gtk3-install.propsin @@ -32,6 +32,12 @@ copy "$(BinDir)\gtk3-icon-browser.exe" $(CopyDir)\bin copy "$(BinDir)\gtk3-icon-browser.pdb" $(CopyDir)\bin copy "$(BinDir)\gtk-encode-symbolic-svg.exe" $(CopyDir)\bin copy "$(BinDir)\gtk-encode-symbolic-svg.pdb" $(CopyDir)\bin +copy "$(BinDir)\gtk-update-icon-cache.exe" $(CopyDir)\bin +copy "$(BinDir)\gtk-update-icon-cache.pdb" $(CopyDir)\bin +copy "$(BinDir)\gtk-query-settings.exe" $(CopyDir)\bin +copy "$(BinDir)\gtk-query-settings.pdb" $(CopyDir)\bin +copy "$(BinDir)\gtk-builder-tool.exe" $(CopyDir)\bin +copy "$(BinDir)\gtk-builder-tool.pdb" $(CopyDir)\bin goto DONE_BIN :DO_BROADWAY_BIN @@ -55,6 +61,12 @@ copy .\Release\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin copy .\Release\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin goto DONE_BIN @@ -73,6 +85,12 @@ copy .\Debug\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin copy .\Debug\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin :DONE_BIN @@ -108,8 +126,12 @@ copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas + echo "Compiling gsettings XML Files..." $(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas + +echo "Generating icon cache......" +$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor" copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk diff --git a/build/win32/vs10/gtk3-install.vcxproj b/build/win32/vs10/gtk3-install.vcxproj index 07188c2443..f87ad9baa6 100644 --- a/build/win32/vs10/gtk3-install.vcxproj +++ b/build/win32/vs10/gtk3-install.vcxproj @@ -215,6 +215,18 @@ {f280bf1a-777a-4fb5-8005-dfbe04621edb} false + + {fc98af16-4c68-42df-906b-93a6804c198a} + false + + + {7d2397cf-4c25-45bc-a1bb-cb4b6e154bbd} + false + + + {9f22107a-3ef7-4b52-b269-747b65307f36} + false + diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index db8e87cb7f..8eb2e9910c 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -10,8 +10,14 @@ EXTRA_DIST += \ gdk-3.vcxproj.filters \ gtk-3.vcxproj \ gtk-3.vcxproj.filters \ + gtk-builder-tool.vcxproj \ + gtk-builder-tool.vcxproj.filters \ gtk-encode-symbolic-svg.vcxproj \ gtk-encode-symbolic-svg.vcxproj.filters \ + gtk-update-icon-cache.vcxproj \ + gtk-update-icon-cache.vcxproj.filters \ + gtk-query-settings.vcxproj \ + gtk-query-settings.vcxproj.filters \ gtk3-demo.vcxproj \ gtk3-demo.vcxproj.filters \ gtk3-demo-application.vcxproj \ diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am index 643d9d8116..6c124b64c5 100644 --- a/build/win32/vs12/Makefile.am +++ b/build/win32/vs12/Makefile.am @@ -10,8 +10,14 @@ EXTRA_DIST += \ gdk-3.vcxproj.filters \ gtk-3.vcxproj \ gtk-3.vcxproj.filters \ + gtk-builder-tool.vcxproj \ + gtk-builder-tool.vcxproj.filters \ gtk-encode-symbolic-svg.vcxproj \ gtk-encode-symbolic-svg.vcxproj.filters \ + gtk-query-settings.vcxproj \ + gtk-query-settings.vcxproj.filters \ + gtk-update-icon-cache.vcxproj \ + gtk-update-icon-cache.vcxproj.filters \ gtk3-demo.vcxproj \ gtk3-demo.vcxproj.filters \ gtk3-demo-application.vcxproj \ diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am index b04c06330c..0192eb4fac 100644 --- a/build/win32/vs14/Makefile.am +++ b/build/win32/vs14/Makefile.am @@ -10,8 +10,14 @@ EXTRA_DIST += \ gdk-3.vcxproj.filters \ gtk-3.vcxproj \ gtk-3.vcxproj.filters \ + gtk-builder-tool.vcxproj \ + gtk-builder-tool.vcxproj.filters \ gtk-encode-symbolic-svg.vcxproj \ gtk-encode-symbolic-svg.vcxproj.filters \ + gtk-query-settings.vcxproj \ + gtk-query-settings.vcxproj.filters \ + gtk-update-icon-cache.vcxproj \ + gtk-update-icon-cache.vcxproj.filters \ gtk3-demo.vcxproj \ gtk3-demo.vcxproj.filters \ gtk3-demo-application.vcxproj \ diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 20c89fb17e..4e31db7b9f 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -27,7 +27,10 @@ EXTRA_DIST += \ gdk3-win32.vcprojin \ gdk-3.vcprojin \ gtk-3.vcprojin \ + gtk-builder-tool.vcproj \ gtk-encode-symbolic-svg.vcproj \ + gtk-query-settings.vcproj \ + gtk-update-icon-cache.vcproj \ gtk3-demo.vcprojin \ gtk3-demo-application.vcprojin \ gtk3-icon-browser.vcprojin \ diff --git a/build/win32/vs9/gtk+.sln b/build/win32/vs9/gtk+.sln index 5571ae6362..be494e2acb 100644 --- a/build/win32/vs9/gtk+.sln +++ b/build/win32/vs9/gtk+.sln @@ -57,6 +57,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil-3", "gailutil-3.vc {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-update-icon-cache", "gtk-update-icon-cache.vcproj", "{FC98AF16-4C68-42DF-906B-93A6804C198A}" + ProjectSection(ProjectDependencies) = postProject + {B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-builder-tool", "gtk-builder-tool.vcproj", "{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}" + ProjectSection(ProjectDependencies) = postProject + {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-query-settings.vcproj", "{9F22107A-3EF7-4B52-B269-747B65307F36}" + ProjectSection(ProjectDependencies) = postProject + {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}" ProjectSection(ProjectDependencies) = postProject {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} @@ -67,6 +84,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-instal {343333C4-D46C-4C97-A986-959CCA6F1DE0} = {343333C4-D46C-4C97-A986-959CCA6F1DE0} {E9687D21-E214-4A0C-9EB4-8B38EBB783E5} = {E9687D21-E214-4A0C-9EB4-8B38EBB783E5} {F280BF1A-777A-4FB5-8005-DFBE04621EDB} = {F280BF1A-777A-4FB5-8005-DFBE04621EDB} + {FC98AF16-4C68-42DF-906B-93A6804C198A} = {FC98AF16-4C68-42DF-906B-93A6804C198A} + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD} = {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD} + {9F22107A-3EF7-4B52-B269-747B65307F36} = {9F22107A-3EF7-4B52-B269-747B65307F36} EndProjectSection EndProject Global @@ -257,6 +277,54 @@ Global {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.Build.0 = Release|Win32 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.ActiveCfg = Release|x64 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.Build.0 = Release|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.ActiveCfg = Debug|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.Build.0 = Debug|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.ActiveCfg = Debug|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.Build.0 = Debug|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.ActiveCfg = Release|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.Build.0 = Release|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.ActiveCfg = Release|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.Build.0 = Release|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.Build.0 = Debug|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.Build.0 = Release|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.ActiveCfg = Release|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.Build.0 = Release|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.ActiveCfg = Debug|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.Build.0 = Debug|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.ActiveCfg = Debug|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.Build.0 = Debug|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.ActiveCfg = Release|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.Build.0 = Release|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.ActiveCfg = Release|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.Build.0 = Release|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.Build.0 = Debug|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.Build.0 = Release|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.ActiveCfg = Release|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.Build.0 = Release|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.ActiveCfg = Debug|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.Build.0 = Debug|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.ActiveCfg = Debug|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.Build.0 = Debug|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.ActiveCfg = Release|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.Build.0 = Release|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.ActiveCfg = Release|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.Build.0 = Release|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.Build.0 = Debug|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/win32/vs9/gtk-builder-tool.vcproj b/build/win32/vs9/gtk-builder-tool.vcproj new file mode 100644 index 0000000000..543f00ff25 --- /dev/null +++ b/build/win32/vs9/gtk-builder-tool.vcproj @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gtk-query-settings.vcproj b/build/win32/vs9/gtk-query-settings.vcproj new file mode 100644 index 0000000000..a893c958dd --- /dev/null +++ b/build/win32/vs9/gtk-query-settings.vcproj @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gtk-update-icon-cache.vcproj b/build/win32/vs9/gtk-update-icon-cache.vcproj new file mode 100644 index 0000000000..0b15f3a038 --- /dev/null +++ b/build/win32/vs9/gtk-update-icon-cache.vcproj @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gtk3-install.vspropsin b/build/win32/vs9/gtk3-install.vspropsin index 1b102ef6d0..d3e46c0c58 100644 --- a/build/win32/vs9/gtk3-install.vspropsin +++ b/build/win32/vs9/gtk3-install.vspropsin @@ -31,6 +31,12 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\b copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin +copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin +copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin +copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin +copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin +copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin +copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin goto DONE_BIN :DO_BROADWAY_BIN @@ -54,6 +60,12 @@ copy .\Release\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin &#x copy .\Release\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin +copy .\Release\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin +copy .\Release\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin +copy .\Release\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin +copy .\Release\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin +copy .\Release\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin +copy .\Release\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin goto DONE_BIN :DO_BROADWAY_DEBUG @@ -71,6 +83,12 @@ copy .\Debug\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin copy .\Debug\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin +copy .\Debug\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin +copy .\Debug\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin +copy .\Debug\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin +copy .\Debug\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin +copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin +copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin :DONE_BIN " /> @@ -113,6 +131,9 @@ copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\ echo "Compiling gsettings XML Files..." $(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas + +echo "Generating icon cache..." +$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor" " />